/ Amiga Format CD 7 / Amiga Format AFCD07 (Dec 1996, Issue 91).iso / serious / shareware / programming / emacs-complete / fsf / emacs / lisp / diff.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 72 6d 73 40 6d 6f 6c |piled by| rms@mol|
|00000020| 65 2e 67 6e 75 2e 61 69 | 2e 6d 69 74 2e 65 64 75 |e.gnu.ai|.mit.edu|
|00000030| 20 6f 6e 20 54 75 65 20 | 4a 75 6c 20 31 32 20 30 | on Tue |Jul 12 0|
|00000040| 32 3a 34 38 3a 33 31 20 | 31 39 39 34 0a 3b 3b 3b |2:48:31 |1994.;;;|
|00000050| 20 66 72 6f 6d 20 66 69 | 6c 65 20 2f 68 6f 6d 65 | from fi|le /home|
|00000060| 2f 66 73 66 2f 72 6d 73 | 2f 65 31 39 2f 6c 69 73 |/fsf/rms|/e19/lis|
|00000070| 70 2f 64 69 66 66 2e 65 | 6c 0a 3b 3b 3b 20 65 6d |p/diff.e|l.;;; em|
|00000080| 61 63 73 20 76 65 72 73 | 69 6f 6e 20 31 39 2e 32 |acs vers|ion 19.2|
|00000090| 35 2e 31 36 2e 0a 3b 3b | 3b 20 62 79 74 65 63 6f |5.16..;;|; byteco|
|000000a0| 6d 70 20 76 65 72 73 69 | 6f 6e 20 46 53 46 20 32 |mp versi|on FSF 2|
|000000b0| 2e 31 30 0a 3b 3b 3b 20 | 6f 70 74 69 6d 69 7a 61 |.10.;;; |optimiza|
|000000c0| 74 69 6f 6e 20 69 73 20 | 6f 6e 2e 0a 3b 3b 3b 20 |tion is |on..;;; |
|000000d0| 74 68 69 73 20 66 69 6c | 65 20 75 73 65 73 20 6f |this fil|e uses o|
|000000e0| 70 63 6f 64 65 73 20 77 | 68 69 63 68 20 64 6f 20 |pcodes w|hich do |
|000000f0| 6e 6f 74 20 65 78 69 73 | 74 20 69 6e 20 45 6d 61 |not exis|t in Ema|
|00000100| 63 73 20 31 38 2e 0a 0a | 28 69 66 20 28 61 6e 64 |cs 18...|(if (and|
|00000110| 20 28 62 6f 75 6e 64 70 | 20 27 65 6d 61 63 73 2d | (boundp| 'emacs-|
|00000120| 76 65 72 73 69 6f 6e 29 | 0a 09 20 28 6f 72 20 28 |version)|.. (or (|
|00000130| 61 6e 64 20 28 62 6f 75 | 6e 64 70 20 27 65 70 6f |and (bou|ndp 'epo|
|00000140| 63 68 3a 3a 76 65 72 73 | 69 6f 6e 29 20 65 70 6f |ch::vers|ion) epo|
|00000150| 63 68 3a 3a 76 65 72 73 | 69 6f 6e 29 0a 09 20 20 |ch::vers|ion)..  |
|00000160| 20 20 20 28 73 74 72 69 | 6e 67 2d 6c 65 73 73 70 |   (stri|ng-lessp|
|00000170| 20 65 6d 61 63 73 2d 76 | 65 72 73 69 6f 6e 20 22 | emacs-v|ersion "|
|00000180| 31 39 22 29 29 29 0a 20 | 20 20 20 28 65 72 72 6f |19"))). |   (erro|
|00000190| 72 20 22 60 2f 68 6f 6d | 65 2f 66 73 66 2f 72 6d |r "`/hom|e/fsf/rm|
|000001a0| 73 2f 65 31 39 2f 6c 69 | 73 70 2f 64 69 66 66 2e |s/e19/li|sp/diff.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 22 29 29 | for Ema|cs 19"))|
|000001d0| 0a 0a 28 72 65 71 75 69 | 72 65 20 28 71 75 6f 74 |..(requi|re (quot|
|000001e0| 65 20 63 6f 6d 70 69 6c | 65 29 29 0a 28 64 65 66 |e compil|e)).(def|
|000001f0| 76 61 72 20 64 69 66 66 | 2d 73 77 69 74 63 68 65 |var diff|-switche|
|00000200| 73 20 22 2d 63 22 20 22 | 5c 0a 2a 41 20 73 74 72 |s "-c" "|\.*A str|
|00000210| 69 6e 67 20 6f 72 20 6c | 69 73 74 20 6f 66 20 73 |ing or l|ist of s|
|00000220| 74 72 69 6e 67 73 20 73 | 70 65 63 69 66 79 69 6e |trings s|pecifyin|
|00000230| 67 20 73 77 69 74 63 68 | 65 73 20 74 6f 20 62 65 |g switch|es to be|
|00000240| 20 62 65 20 70 61 73 73 | 65 64 20 74 6f 20 64 69 | be pass|ed to di|
|00000250| 66 66 2e 22 29 0a 28 64 | 65 66 76 61 72 20 64 69 |ff.").(d|efvar di|
|00000260| 66 66 2d 72 65 67 65 78 | 70 2d 61 6c 69 73 74 20 |ff-regex|p-alist |
|00000270| 28 71 75 6f 74 65 20 28 | 28 22 5e 40 40 20 2d 5c |(quote (|("^@@ -\|
|00000280| 5c 28 5b 30 2d 39 5d 2b | 5c 5c 29 2c 5b 30 2d 39 |\([0-9]+|\\),[0-9|
|00000290| 5d 2b 20 5c 5c 2b 5c 5c | 28 5b 30 2d 39 5d 2b 5c |]+ \\+\\|([0-9]+\|
|000002a0| 5c 29 2c 5b 30 2d 39 5d | 2b 20 40 40 24 22 20 31 |\),[0-9]|+ @@$" 1|
|000002b0| 20 32 29 20 28 22 5e 5c | 5c 2a 5c 5c 2a 5c 5c 2a | 2) ("^\|\*\\*\\*|
|000002c0| 20 5c 5c 28 5b 30 2d 39 | 5d 2b 5c 5c 29 2c 5b 30 | \\([0-9|]+\\),[0|
|000002d0| 2d 39 5d 2b 20 5c 5c 2a | 5c 5c 2a 5c 5c 2a 5c 5c |-9]+ \\*|\\*\\*\\|
|000002e0| 2a 24 22 20 31 20 6e 69 | 6c 29 20 28 22 5e 2d 2d |*$" 1 ni|l) ("^--|
|000002f0| 2d 20 5c 5c 28 5b 30 2d | 39 5d 2b 5c 5c 29 2c 5b |- \\([0-|9]+\\),[|
|00000300| 30 2d 39 5d 2b 20 2d 2d | 2d 2d 24 22 20 6e 69 6c |0-9]+ --|--$" nil|
|00000310| 20 31 29 20 28 22 5e 5c | 5c 28 5b 30 2d 39 5d 2b | 1) ("^\|\([0-9]+|
|00000320| 5c 5c 29 5c 5c 28 2c 5b | 30 2d 39 5d 2b 5c 5c 29 |\\)\\(,[|0-9]+\\)|
|00000330| 3f 5b 61 64 63 5d 5c 5c | 28 5b 30 2d 39 5d 2b 5c |?[adc]\\|([0-9]+\|
|00000340| 5c 29 5c 5c 28 2c 5b 30 | 2d 39 5d 2b 5c 5c 29 3f |\)\\(,[0|-9]+\\)?|
|00000350| 24 22 20 31 20 33 29 20 | 28 22 5e 5c 5c 28 5b 30 |$" 1 3) |("^\\([0|
|00000360| 2d 39 5d 2b 5c 5c 29 5c | 5c 28 2c 5b 30 2d 39 5d |-9]+\\)\|\(,[0-9]|
|00000370| 2b 5c 5c 29 3f 5b 61 64 | 63 5d 24 22 20 31 29 20 |+\\)?[ad|c]$" 1) |
|00000380| 28 22 5e 5b 61 64 63 5d | 5c 5c 28 5b 30 2d 39 5d |("^[adc]|\\([0-9]|
|00000390| 2b 5c 5c 29 5c 5c 28 20 | 5b 30 2d 39 5d 2b 5c 5c |+\\)\\( |[0-9]+\\|
|000003a0| 29 3f 24 22 20 31 29 29 | 29 20 22 5c 0a 41 6c 69 |)?$" 1))|) "\.Ali|
|000003b0| 73 74 20 28 52 45 47 45 | 58 50 20 4f 4c 44 2d 49 |st (REGE|XP OLD-I|
|000003c0| 44 58 20 4e 45 57 2d 49 | 44 58 29 20 6f 66 20 72 |DX NEW-I|DX) of r|
|000003d0| 65 67 75 6c 61 72 20 65 | 78 70 72 65 73 73 69 6f |egular e|xpressio|
|000003e0| 6e 73 20 74 6f 20 6d 61 | 74 63 68 20 64 69 66 66 |ns to ma|tch diff|
|000003f0| 65 72 65 6e 63 65 20 0a | 73 65 63 74 69 6f 6e 73 |erence .|sections|
|00000400| 20 69 6e 20 5c 5c 5b 64 | 69 66 66 5d 20 6f 75 74 | in \\[d|iff] out|
|00000410| 70 75 74 2e 20 20 49 66 | 20 52 45 47 45 58 50 20 |put.  If| REGEXP |
|00000420| 6d 61 74 63 68 65 73 2c | 20 74 68 65 20 4f 4c 44 |matches,| the OLD|
|00000430| 2d 49 44 58 27 74 68 0a | 73 75 62 65 78 70 72 65 |-IDX'th.|subexpre|
|00000440| 73 73 69 6f 6e 20 67 69 | 76 65 73 20 74 68 65 20 |ssion gi|ves the |
|00000450| 6c 69 6e 65 20 6e 75 6d | 62 65 72 20 69 6e 20 74 |line num|ber in t|
|00000460| 68 65 20 6f 6c 64 20 66 | 69 6c 65 2c 20 61 6e 64 |he old f|ile, and|
|00000470| 20 4e 45 57 2d 49 44 58 | 27 74 68 0a 73 75 62 65 | NEW-IDX|'th.sube|
|00000480| 78 70 72 65 73 73 69 6f | 6e 20 67 69 76 65 73 20 |xpressio|n gives |
|00000490| 74 68 65 20 6c 69 6e 65 | 20 6e 75 6d 62 65 72 20 |the line| number |
|000004a0| 69 6e 20 74 68 65 20 6e | 65 77 20 66 69 6c 65 2e |in the n|ew file.|
|000004b0| 20 20 49 66 20 4f 4c 44 | 2d 49 44 58 20 6f 72 20 |  If OLD|-IDX or |
|000004c0| 4e 45 57 2d 49 44 58 0a | 69 73 20 6e 69 6c 2c 20 |NEW-IDX.|is nil, |
|000004d0| 52 45 47 45 58 50 20 6d | 61 74 63 68 65 73 20 6f |REGEXP m|atches o|
|000004e0| 6e 6c 79 20 68 61 6c 66 | 20 61 20 73 65 63 74 69 |nly half| a secti|
|000004f0| 6f 6e 2e 22 29 0a 28 64 | 65 66 76 61 72 20 64 69 |on.").(d|efvar di|
|00000500| 66 66 2d 6f 6c 64 2d 66 | 69 6c 65 20 6e 69 6c 20 |ff-old-f|ile nil |
|00000510| 22 5c 0a 54 68 69 73 20 | 69 73 20 74 68 65 20 6f |"\.This |is the o|
|00000520| 6c 64 20 66 69 6c 65 20 | 6e 61 6d 65 20 69 6e 20 |ld file |name in |
|00000530| 74 68 65 20 63 6f 6d 70 | 61 72 69 73 6f 6e 20 69 |the comp|arison i|
|00000540| 6e 20 74 68 69 73 20 62 | 75 66 66 65 72 2e 22 29 |n this b|uffer.")|
|00000550| 0a 28 64 65 66 76 61 72 | 20 64 69 66 66 2d 6e 65 |.(defvar| diff-ne|
|00000560| 77 2d 66 69 6c 65 20 6e | 69 6c 20 22 5c 0a 54 68 |w-file n|il "\.Th|
|00000570| 69 73 20 69 73 20 74 68 | 65 20 6e 65 77 20 66 69 |is is th|e new fi|
|00000580| 6c 65 20 6e 61 6d 65 20 | 69 6e 20 74 68 65 20 63 |le name |in the c|
|00000590| 6f 6d 70 61 72 69 73 6f | 6e 20 69 6e 20 74 68 69 |ompariso|n in thi|
|000005a0| 73 20 62 75 66 66 65 72 | 2e 22 29 0a 28 64 65 66 |s buffer|.").(def|
|000005b0| 76 61 72 20 64 69 66 66 | 2d 6f 6c 64 2d 74 65 6d |var diff|-old-tem|
|000005c0| 70 2d 66 69 6c 65 20 6e | 69 6c 20 22 5c 0a 54 68 |p-file n|il "\.Th|
|000005d0| 69 73 20 69 73 20 74 68 | 65 20 6e 61 6d 65 20 6f |is is th|e name o|
|000005e0| 66 20 61 20 74 65 6d 70 | 20 66 69 6c 65 20 74 6f |f a temp| file to|
|000005f0| 20 62 65 20 64 65 6c 65 | 74 65 64 20 61 66 74 65 | be dele|ted afte|
|00000600| 72 20 64 69 66 66 20 66 | 69 6e 69 73 68 65 73 2e |r diff f|inishes.|
|00000610| 22 29 0a 28 64 65 66 76 | 61 72 20 64 69 66 66 2d |").(defv|ar diff-|
|00000620| 6e 65 77 2d 74 65 6d 70 | 2d 66 69 6c 65 20 6e 69 |new-temp|-file ni|
|00000630| 6c 20 22 5c 0a 54 68 69 | 73 20 69 73 20 74 68 65 |l "\.Thi|s is the|
|00000640| 20 6e 61 6d 65 20 6f 66 | 20 61 20 74 65 6d 70 20 | name of| a temp |
|00000650| 66 69 6c 65 20 74 6f 20 | 62 65 20 64 65 6c 65 74 |file to |be delet|
|00000660| 65 64 20 61 66 74 65 72 | 20 64 69 66 66 20 66 69 |ed after| diff fi|
|00000670| 6e 69 73 68 65 73 2e 22 | 29 0a 28 64 65 66 61 6c |nishes."|).(defal|
|00000680| 69 61 73 20 28 71 75 6f | 74 65 20 64 69 66 66 2d |ias (quo|te diff-|
|00000690| 70 61 72 73 65 2d 64 69 | 66 66 65 72 65 6e 63 65 |parse-di|fference|
|000006a0| 73 29 20 23 5b 28 6c 69 | 6d 69 74 2d 73 65 61 72 |s) #[(li|mit-sear|
|000006b0| 63 68 20 66 69 6e 64 2d | 61 74 2d 6c 65 61 73 74 |ch find-|at-least|
|000006c0| 29 20 22 c0 11 c2 c3 21 | 88 5c 66 83 0d 00 5c 66 |) "....!|.\f...\f|
|000006d0| 62 88 c5 c6 0e 07 c8 23 | c9 1e 5c 6e cb cc 0e 07 |b......#|..\n....|
|000006e0| 5c 22 29 cd c0 ce c0 1e | 0f 1e 10 1e 11 1e 12 1e |\").....|........|
|000006f0| 13 1e 14 0e 11 84 9e 00 | d5 0e 14 c0 d6 23 83 9e |........|.....#..|
|00000700| 00 0e 13 89 16 0f 83 53 | 00 0e 0f 40 40 94 84 53 |.......S|...@@..S|
|00000710| 00 0e 0f 41 89 16 0f 84 | 42 00 0e 0f 40 89 16 0f |...A....|B...@...|
|00000720| 41 40 83 68 00 0e 12 0e | 17 0e 0f 41 40 5c 22 88 |A@.h....|...A@\".|
|00000730| d8 0e 0f 38 83 79 00 0e | 12 0e 19 d8 0e 0f 38 5c |...8.y..|......8\|
|00000740| 22 88 0e 10 54 16 10 0e | 1a 83 8b 00 0e 10 0e 1a |"...T...|........|
|00000750| 59 84 97 00 0e 1b 83 2c | 00 60 0e 1b 59 83 2c 00 |Y......,|.`..Y.,.|
|00000760| d6 89 16 11 83 31 00 0e | 11 83 a8 00 60 14 82 aa |.....1..|....`...|
|00000770| 00 64 14 c2 dc 21 88 2e | 06 09 9f 89 11 87 22 20 |.d...!..|......" |
|00000780| 5b 6e 69 6c 20 63 6f 6d | 70 69 6c 61 74 69 6f 6e |[nil com|pilation|
|00000790| 2d 65 72 72 6f 72 2d 6c | 69 73 74 20 6d 65 73 73 |-error-l|ist mess|
|000007a0| 61 67 65 20 22 50 61 72 | 73 69 6e 67 20 64 69 66 |age "Par|sing dif|
|000007b0| 66 65 72 65 6e 63 65 73 | 2e 2e 2e 22 20 63 6f 6d |ferences|..." com|
|000007c0| 70 69 6c 61 74 69 6f 6e | 2d 70 61 72 73 69 6e 67 |pilation|-parsing|
|000007d0| 2d 65 6e 64 20 6d 61 70 | 63 6f 6e 63 61 74 20 23 |-end map|concat #|
|000007e0| 5b 28 65 6c 74 29 20 22 | c0 09 40 c2 51 87 22 20 |[(elt) "|..@.Q." |
|000007f0| 5b 22 5c 5c 28 22 20 65 | 6c 74 20 22 5c 5c 29 22 |["\\(" e|lt "\\)"|
|00000800| 5d 20 33 5d 20 64 69 66 | 66 2d 72 65 67 65 78 70 |] 3] dif|f-regexp|
|00000810| 2d 61 6c 69 73 74 20 22 | 5c 5c 7c 22 20 31 20 73 |-alist "|\\|" 1 s|
|00000820| 75 62 65 78 70 72 20 6d | 61 70 63 61 72 20 23 5b |ubexpr m|apcar #[|
|00000830| 28 65 6c 74 29 20 22 08 | c1 c2 0b 41 5c 22 42 08 |(elt) ".|...A\"B.|
|00000840| c4 0b 40 21 c5 5c 5c 5c | 5c 10 87 22 20 5b 73 75 |..@!.\\\|\.." [su|
|00000850| 62 65 78 70 72 20 6d 61 | 70 63 61 72 20 23 5b 28 |bexpr ma|pcar #[(|
|00000860| 6e 29 20 22 08 85 07 00 | 09 08 5c 5c 87 22 20 5b |n) "....|..\\." [|
|00000870| 6e 20 73 75 62 65 78 70 | 72 5d 20 32 5d 20 65 6c |n subexp|r] 2] el|
|00000880| 74 20 63 6f 75 6e 74 2d | 72 65 67 65 78 70 2d 67 |t count-|regexp-g|
|00000890| 72 6f 75 70 69 6e 67 73 | 20 31 5d 20 34 5d 20 23 |roupings| 1] 4] #|
|000008a0| 5b 28 66 69 6c 65 20 73 | 75 62 65 78 70 72 29 20 |[(file s|ubexpr) |
|000008b0| 22 8a 08 94 62 88 c1 79 | 88 c2 20 29 c3 08 94 08 |"...b..y|.. )....|
|000008c0| 95 7b 21 1c 8a c5 20 1e | 06 c7 8e c8 0e 09 21 71 |.{!... .|......!q|
|000008d0| 88 2a 8a ca 5c 66 21 88 | c2 20 2b 42 0e 0b 42 89 |.*..\f!.|. +B..B.|
|000008e0| 16 0b 87 22 20 5b 73 75 | 62 65 78 70 72 20 30 20 |..." [su|bexpr 0 |
|000008f0| 70 6f 69 6e 74 2d 6d 61 | 72 6b 65 72 20 73 74 72 |point-ma|rker str|
|00000900| 69 6e 67 2d 74 6f 2d 69 | 6e 74 20 6c 69 6e 65 20 |ing-to-i|nt line |
|00000910| 6d 61 74 63 68 2d 64 61 | 74 61 20 6d 61 74 63 68 |match-da|ta match|
|00000920| 2d 64 61 74 61 20 28 28 | 73 74 6f 72 65 2d 6d 61 |-data ((|store-ma|
|00000930| 74 63 68 2d 64 61 74 61 | 20 6d 61 74 63 68 2d 64 |tch-data| match-d|
|00000940| 61 74 61 29 29 20 66 69 | 6e 64 2d 66 69 6c 65 2d |ata)) fi|nd-file-|
|00000950| 6e 6f 73 65 6c 65 63 74 | 20 66 69 6c 65 20 67 6f |noselect| file go|
|00000960| 74 6f 2d 6c 69 6e 65 20 | 63 6f 6d 70 69 6c 61 74 |to-line |compilat|
|00000970| 69 6f 6e 2d 65 72 72 6f | 72 2d 6c 69 73 74 5d 20 |ion-erro|r-list] |
|00000980| 34 5d 20 30 20 67 20 6e | 75 6d 2d 6c 6f 63 69 2d |4] 0 g n|um-loci-|
|00000990| 66 6f 75 6e 64 20 66 6f | 75 6e 64 2d 64 65 73 69 |found fo|und-desi|
|000009a0| 72 65 64 20 6e 65 77 2d | 65 72 72 6f 72 20 67 72 |red new-|error gr|
|000009b0| 6f 75 70 73 20 72 65 67 | 65 78 70 20 72 65 2d 73 |oups reg|exp re-s|
|000009c0| 65 61 72 63 68 2d 66 6f | 72 77 61 72 64 20 74 20 |earch-fo|rward t |
|000009d0| 64 69 66 66 2d 6f 6c 64 | 2d 66 69 6c 65 20 32 20 |diff-old|-file 2 |
|000009e0| 64 69 66 66 2d 6e 65 77 | 2d 66 69 6c 65 20 66 69 |diff-new|-file fi|
|000009f0| 6e 64 2d 61 74 2d 6c 65 | 61 73 74 20 6c 69 6d 69 |nd-at-le|ast limi|
|00000a00| 74 2d 73 65 61 72 63 68 | 20 22 50 61 72 73 69 6e |t-search| "Parsin|
|00000a10| 67 20 64 69 66 66 65 72 | 65 6e 63 65 73 2e 2e 2e |g differ|ences...|
|00000a20| 64 6f 6e 65 22 5d 20 37 | 5d 29 0a 28 64 65 66 61 |done"] 7|]).(defa|
|00000a30| 6c 69 61 73 20 27 64 69 | 66 66 20 23 5b 28 6f 6c |lias 'di|ff #[(ol|
|00000a40| 64 20 6e 65 77 20 26 6f | 70 74 69 6f 6e 61 6c 20 |d new &o|ptional |
|00000a50| 73 77 69 74 63 68 65 73 | 29 20 22 c0 09 21 11 c0 |switches|) "..!..|
|00000a60| 5c 6e 21 12 c3 5c 6e 21 | c3 09 21 c4 1d 1e 06 1e |\n!..\n!|..!.....|
|00000a70| 07 c4 8e c8 c9 ca cb 0e | 5c 66 83 30 00 0e 5c 66 |........|\f.0..\f|
|00000a80| 3a 83 2a 00 0e 5c 66 82 | 3e 00 0e 5c 66 43 82 3e |:.*..\f.|>..\fC.>|
|00000a90| 00 0e 0d 3a 83 3b 00 0e | 0d 82 3e 00 0e 0d 43 0e |...:.;..|..>...C.|
|00000aa0| 07 84 48 00 0e 06 85 4d | 00 ce 5c 6e ce 09 46 cf |..H....M|..\n..F.|
|00000ab0| 0e 07 86 54 00 5c 6e 21 | 43 cf 0e 06 86 5d 00 09 |...T.\n!|C....]..|
|00000ac0| 21 43 25 d0 23 1e 11 d2 | 0e 11 d3 d4 d5 24 15 d6 |!C%.#...|.....$..|
|00000ad0| 0d 21 88 d7 d8 21 5c 6e | 4c 88 d7 d9 21 09 4c 88 |.!...!\n|L...!.L.|
|00000ae0| d7 da 21 0e 07 4c 88 d7 | db 21 0e 06 4c 88 d7 dc |..!..L..|.!..L...|
|00000af0| 21 dd 4c 88 0d 2d 87 22 | 20 5b 65 78 70 61 6e 64 |!.L..-."| [expand|
|00000b00| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 6e 65 77 20 6f |-file-na|me new o|
|00000b10| 6c 64 20 66 69 6c 65 2d | 6c 6f 63 61 6c 2d 63 6f |ld file-|local-co|
|00000b20| 70 79 20 6e 69 6c 20 62 | 75 66 20 6e 65 77 2d 61 |py nil b|uf new-a|
|00000b30| 6c 74 20 6f 6c 64 2d 61 | 6c 74 20 6d 61 70 63 6f |lt old-a|lt mapco|
|00000b40| 6e 63 61 74 20 69 64 65 | 6e 74 69 74 79 20 61 70 |ncat ide|ntity ap|
|00000b50| 70 65 6e 64 20 28 22 64 | 69 66 66 22 29 20 73 77 |pend ("d|iff") sw|
|00000b60| 69 74 63 68 65 73 20 64 | 69 66 66 2d 73 77 69 74 |itches d|iff-swit|
|00000b70| 63 68 65 73 20 22 2d 4c | 22 20 73 68 65 6c 6c 2d |ches "-L|" shell-|
|00000b80| 71 75 6f 74 65 2d 61 72 | 67 75 6d 65 6e 74 20 22 |quote-ar|gument "|
|00000b90| 20 22 20 63 6f 6d 6d 61 | 6e 64 20 63 6f 6d 70 69 | " comma|nd compi|
|00000ba0| 6c 65 2d 69 6e 74 65 72 | 6e 61 6c 20 22 4e 6f 20 |le-inter|nal "No |
|00000bb0| 6d 6f 72 65 20 64 69 66 | 66 65 72 65 6e 63 65 73 |more dif|ferences|
|00000bc0| 22 20 22 44 69 66 66 22 | 20 64 69 66 66 2d 70 61 |" "Diff"| diff-pa|
|00000bd0| 72 73 65 2d 64 69 66 66 | 65 72 65 6e 63 65 73 20 |rse-diff|erences |
|00000be0| 70 6f 70 2d 74 6f 2d 62 | 75 66 66 65 72 20 6d 61 |pop-to-b|uffer ma|
|00000bf0| 6b 65 2d 6c 6f 63 61 6c | 2d 76 61 72 69 61 62 6c |ke-local|-variabl|
|00000c00| 65 20 64 69 66 66 2d 6f | 6c 64 2d 66 69 6c 65 20 |e diff-o|ld-file |
|00000c10| 64 69 66 66 2d 6e 65 77 | 2d 66 69 6c 65 20 64 69 |diff-new|-file di|
|00000c20| 66 66 2d 6f 6c 64 2d 74 | 65 6d 70 2d 66 69 6c 65 |ff-old-t|emp-file|
|00000c30| 20 64 69 66 66 2d 6e 65 | 77 2d 74 65 6d 70 2d 66 | diff-ne|w-temp-f|
|00000c40| 69 6c 65 20 63 6f 6d 70 | 69 6c 61 74 69 6f 6e 2d |ile comp|ilation-|
|00000c50| 66 69 6e 69 73 68 2d 66 | 75 6e 63 74 69 6f 6e 20 |finish-f|unction |
|00000c60| 23 5b 28 62 75 66 66 20 | 6d 73 67 29 20 22 08 83 |#[(buff |msg) "..|
|00000c70| 08 00 c1 08 21 88 5c 6e | 85 0f 00 c1 5c 6e 21 87 |....!.\n|....\n!.|
|00000c80| 22 20 5b 64 69 66 66 2d | 6f 6c 64 2d 74 65 6d 70 |" [diff-|old-temp|
|00000c90| 2d 66 69 6c 65 20 64 65 | 6c 65 74 65 2d 66 69 6c |-file de|lete-fil|
|00000ca0| 65 20 64 69 66 66 2d 6e | 65 77 2d 74 65 6d 70 2d |e diff-n|ew-temp-|
|00000cb0| 66 69 6c 65 5d 20 32 5d | 5d 20 39 20 22 5c 0a 46 |file] 2]|] 9 "\.F|
|00000cc0| 69 6e 64 20 61 6e 64 20 | 64 69 73 70 6c 61 79 20 |ind and |display |
|00000cd0| 74 68 65 20 64 69 66 66 | 65 72 65 6e 63 65 73 20 |the diff|erences |
|00000ce0| 62 65 74 77 65 65 6e 20 | 4f 4c 44 20 61 6e 64 20 |between |OLD and |
|00000cf0| 4e 45 57 20 66 69 6c 65 | 73 2e 0a 49 6e 74 65 72 |NEW file|s..Inter|
|00000d00| 61 63 74 69 76 65 6c 79 | 20 74 68 65 20 63 75 72 |actively| the cur|
|00000d10| 72 65 6e 74 20 62 75 66 | 66 65 72 27 73 20 66 69 |rent buf|fer's fi|
|00000d20| 6c 65 20 6e 61 6d 65 20 | 69 73 20 74 68 65 20 64 |le name |is the d|
|00000d30| 65 66 61 75 6c 74 20 66 | 6f 72 20 4e 45 57 0a 61 |efault f|or NEW.a|
|00000d40| 6e 64 20 61 20 62 61 63 | 6b 75 70 20 66 69 6c 65 |nd a bac|kup file|
|00000d50| 20 66 6f 72 20 4e 45 57 | 20 69 73 20 74 68 65 20 | for NEW| is the |
|00000d60| 64 65 66 61 75 6c 74 20 | 66 6f 72 20 4f 4c 44 2e |default |for OLD.|
|00000d70| 0a 57 69 74 68 20 70 72 | 65 66 69 78 20 61 72 67 |.With pr|efix arg|
|00000d80| 2c 20 70 72 6f 6d 70 74 | 20 66 6f 72 20 64 69 66 |, prompt| for dif|
|00000d90| 66 20 73 77 69 74 63 68 | 65 73 2e 22 20 28 62 79 |f switch|es." (by|
|00000da0| 74 65 2d 63 6f 64 65 20 | 22 c0 89 19 1a c3 20 89 |te-code |"..... .|
|00000db0| 11 83 1f 00 c4 09 21 83 | 1f 00 c5 c6 c7 09 21 c8 |......!.|......!.|
|00000dc0| 51 c0 09 c9 24 82 25 00 | c5 ca c0 89 c9 24 89 11 |Q...$.%.|.....$..|
|00000dd0| cb 09 21 89 12 83 45 00 | c4 5c 6e 21 83 45 00 c5 |..!...E.|.\n!.E..|
|00000de0| cc c7 5c 6e 21 c8 51 cd | 5c 6e 21 5c 6e c9 24 82 |..\n!.Q.|\n!\n.$.|
|00000df0| 4d 00 c5 ce cd 09 21 c0 | c9 24 89 12 44 9f 2a 0e |M.....!.|.$..D.*.|
|00000e00| 0f 85 6c 00 d0 d1 0e 12 | 3b 83 64 00 0e 12 82 6a |..l.....|;.d....j|
|00000e10| 00 d3 d4 0e 12 d5 23 5c | 22 43 a4 87 22 20 5b 6e |......#\|"C.." [n|
|00000e20| 69 6c 20 6e 65 77 66 20 | 6f 6c 64 66 20 62 75 66 |il newf |oldf buf|
|00000e30| 66 65 72 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |fer-file|-name fi|
|00000e40| 6c 65 2d 65 78 69 73 74 | 73 2d 70 20 72 65 61 64 |le-exist|s-p read|
|00000e50| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 44 69 66 66 |-file-na|me "Diff|
|00000e60| 20 6e 65 77 20 66 69 6c | 65 3a 20 28 22 20 66 69 | new fil|e: (" fi|
|00000e70| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00000e80| 74 6f 72 79 20 22 29 20 | 22 20 74 20 22 44 69 66 |tory ") |" t "Dif|
|00000e90| 66 20 6e 65 77 20 66 69 | 6c 65 3a 20 22 20 66 69 |f new fi|le: " fi|
|00000ea0| 6c 65 2d 6e 65 77 65 73 | 74 2d 62 61 63 6b 75 70 |le-newes|t-backup|
|00000eb0| 20 22 44 69 66 66 20 6f | 72 69 67 69 6e 61 6c 20 | "Diff o|riginal |
|00000ec0| 66 69 6c 65 3a 20 28 22 | 20 66 69 6c 65 2d 6e 61 |file: ("| file-na|
|00000ed0| 6d 65 2d 64 69 72 65 63 | 74 6f 72 79 20 22 44 69 |me-direc|tory "Di|
|00000ee0| 66 66 20 6f 72 69 67 69 | 6e 61 6c 20 66 69 6c 65 |ff origi|nal file|
|00000ef0| 3a 20 22 20 63 75 72 72 | 65 6e 74 2d 70 72 65 66 |: " curr|ent-pref|
|00000f00| 69 78 2d 61 72 67 20 72 | 65 61 64 2d 73 74 72 69 |ix-arg r|ead-stri|
|00000f10| 6e 67 20 22 44 69 66 66 | 20 73 77 69 74 63 68 65 |ng "Diff| switche|
|00000f20| 73 3a 20 22 20 64 69 66 | 66 2d 73 77 69 74 63 68 |s: " dif|f-switch|
|00000f30| 65 73 20 6d 61 70 63 6f | 6e 63 61 74 20 69 64 65 |es mapco|ncat ide|
|00000f40| 6e 74 69 74 79 20 22 20 | 22 5d 20 38 29 5d 29 0a |ntity " |"] 8)]).|
|00000f50| 28 64 65 66 61 6c 69 61 | 73 20 27 64 69 66 66 2d |(defalia|s 'diff-|
|00000f60| 62 61 63 6b 75 70 20 23 | 5b 28 66 69 6c 65 20 26 |backup #|[(file &|
|00000f70| 6f 70 74 69 6f 6e 61 6c | 20 73 77 69 74 63 68 65 |optional| switche|
|00000f80| 73 29 20 22 c0 89 19 1a | c3 5c 66 21 83 13 00 5c |s) "....|.\f!...\|
|00000f90| 66 12 c5 5c 66 21 11 82 | 20 00 c6 5c 66 21 86 1d |f..\f!..| ..\f!..|
|00000fa0| 00 c7 c8 5c 66 5c 22 12 | 5c 66 11 c9 5c 6e 09 0e |...\f\".|\f..\n..|
|00000fb0| 5c 6e 23 2a 87 22 20 5b | 6e 69 6c 20 6f 72 69 20 |\n#*." [|nil ori |
|00000fc0| 62 61 6b 20 62 61 63 6b | 75 70 2d 66 69 6c 65 2d |bak back|up-file-|
|00000fd0| 6e 61 6d 65 2d 70 20 66 | 69 6c 65 20 66 69 6c 65 |name-p f|ile file|
|00000fe0| 2d 6e 61 6d 65 2d 73 61 | 6e 73 2d 76 65 72 73 69 |-name-sa|ns-versi|
|00000ff0| 6f 6e 73 20 64 69 66 66 | 2d 6c 61 74 65 73 74 2d |ons diff|-latest-|
|00001000| 62 61 63 6b 75 70 2d 66 | 69 6c 65 20 65 72 72 6f |backup-f|ile erro|
|00001010| 72 20 22 4e 6f 20 62 61 | 63 6b 75 70 20 66 6f 75 |r "No ba|ckup fou|
|00001020| 6e 64 20 66 6f 72 20 25 | 73 22 20 64 69 66 66 20 |nd for %|s" diff |
|00001030| 73 77 69 74 63 68 65 73 | 5d 20 34 20 22 5c 0a 44 |switches|] 4 "\.D|
|00001040| 69 66 66 20 74 68 69 73 | 20 66 69 6c 65 20 77 69 |iff this| file wi|
|00001050| 74 68 20 69 74 73 20 62 | 61 63 6b 75 70 20 66 69 |th its b|ackup fi|
|00001060| 6c 65 20 6f 72 20 76 69 | 63 65 20 76 65 72 73 61 |le or vi|ce versa|
|00001070| 2e 0a 55 73 65 73 20 74 | 68 65 20 6c 61 74 65 73 |..Uses t|he lates|
|00001080| 74 20 62 61 63 6b 75 70 | 2c 20 69 66 20 74 68 65 |t backup|, if the|
|00001090| 72 65 20 61 72 65 20 73 | 65 76 65 72 61 6c 20 6e |re are s|everal n|
|000010a0| 75 6d 65 72 69 63 61 6c | 20 62 61 63 6b 75 70 73 |umerical| backups|
|000010b0| 2e 0a 49 66 20 74 68 69 | 73 20 66 69 6c 65 20 69 |..If thi|s file i|
|000010c0| 73 20 61 20 62 61 63 6b | 75 70 2c 20 64 69 66 66 |s a back|up, diff|
|000010d0| 20 69 74 20 77 69 74 68 | 20 69 74 73 20 6f 72 69 | it with| its ori|
|000010e0| 67 69 6e 61 6c 2e 0a 54 | 68 65 20 62 61 63 6b 75 |ginal..T|he backu|
|000010f0| 70 20 66 69 6c 65 20 69 | 73 20 74 68 65 20 66 69 |p file i|s the fi|
|00001100| 72 73 74 20 66 69 6c 65 | 20 67 69 76 65 6e 20 74 |rst file| given t|
|00001110| 6f 20 60 64 69 66 66 27 | 2e 22 20 28 6c 69 73 74 |o `diff'|." (list|
|00001120| 20 28 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 | (read-f|ile-name|
|00001130| 20 22 44 69 66 66 20 28 | 66 69 6c 65 20 77 69 74 | "Diff (|file wit|
|00001140| 68 20 62 61 63 6b 75 70 | 29 3a 20 22 29 20 28 69 |h backup|): ") (i|
|00001150| 66 20 63 75 72 72 65 6e | 74 2d 70 72 65 66 69 78 |f curren|t-prefix|
|00001160| 2d 61 72 67 20 28 72 65 | 61 64 2d 73 74 72 69 6e |-arg (re|ad-strin|
|00001170| 67 20 22 44 69 66 66 20 | 73 77 69 74 63 68 65 73 |g "Diff |switches|
|00001180| 3a 20 22 20 28 69 66 20 | 28 73 74 72 69 6e 67 70 |: " (if |(stringp|
|00001190| 20 64 69 66 66 2d 73 77 | 69 74 63 68 65 73 29 20 | diff-sw|itches) |
|000011a0| 64 69 66 66 2d 73 77 69 | 74 63 68 65 73 20 28 6d |diff-swi|tches (m|
|000011b0| 61 70 63 6f 6e 63 61 74 | 20 28 71 75 6f 74 65 20 |apconcat| (quote |
|000011c0| 69 64 65 6e 74 69 74 79 | 29 20 64 69 66 66 2d 73 |identity|) diff-s|
|000011d0| 77 69 74 63 68 65 73 20 | 22 20 22 29 29 29 20 6e |witches |" "))) n|
|000011e0| 69 6c 29 29 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |il))]).(|defalias|
|000011f0| 20 27 64 69 66 66 2d 6c | 61 74 65 73 74 2d 62 61 | 'diff-l|atest-ba|
|00001200| 63 6b 75 70 2d 66 69 6c | 65 20 23 5b 28 66 6e 29 |ckup-fil|e #[(fn)|
|00001210| 20 22 c0 09 c2 5c 22 89 | 1b 83 10 00 0b c2 09 5c | "...\".|.......\|
|00001220| 22 82 50 00 c4 c5 09 21 | 21 11 c6 09 21 1e 07 c8 |".P....!|!...!...|
|00001230| 0e 07 21 85 24 00 0e 07 | 29 86 50 00 c9 09 21 40 |..!.$...|).P...!@|
|00001240| 1e 5c 6e cb 0e 5c 6e 21 | 1e 5c 66 cd ce 0e 5c 6e |.\n..\n!|.\f...\n|
|00001250| 21 21 cf 50 89 1e 10 47 | 1e 11 0e 5c 66 d2 d3 0e |!!.P...G|...\f...|
|00001260| 10 0e 5c 66 5c 22 d4 5c | 22 40 50 2c 29 87 22 20 |..\f\".\|"@P,)." |
|00001270| 5b 66 69 6e 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 2d |[find-fi|le-name-|
|00001280| 68 61 6e 64 6c 65 72 20 | 66 6e 20 64 69 66 66 2d |handler |fn diff-|
|00001290| 6c 61 74 65 73 74 2d 62 | 61 63 6b 75 70 2d 66 69 |latest-b|ackup-fi|
|000012a0| 6c 65 20 68 61 6e 64 6c | 65 72 20 66 69 6c 65 2d |le handl|er file-|
|000012b0| 63 68 61 73 65 2d 6c 69 | 6e 6b 73 20 65 78 70 61 |chase-li|nks expa|
|000012c0| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 6d 61 6b |nd-file-|name mak|
|000012d0| 65 2d 62 61 63 6b 75 70 | 2d 66 69 6c 65 2d 6e 61 |e-backup|-file-na|
|000012e0| 6d 65 20 62 61 6b 20 66 | 69 6c 65 2d 65 78 69 73 |me bak f|ile-exis|
|000012f0| 74 73 2d 70 20 66 69 6e | 64 2d 62 61 63 6b 75 70 |ts-p fin|d-backup|
|00001300| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 62 61 63 6b 75 |-file-na|me backu|
|00001310| 70 6e 61 6d 65 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |pname fi|le-name-|
|00001320| 64 69 72 65 63 74 6f 72 | 79 20 64 69 72 20 66 69 |director|y dir fi|
|00001330| 6c 65 2d 6e 61 6d 65 2d | 73 61 6e 73 2d 76 65 72 |le-name-|sans-ver|
|00001340| 73 69 6f 6e 73 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |sions fi|le-name-|
|00001350| 6e 6f 6e 64 69 72 65 63 | 74 6f 72 79 20 22 2e 7e |nondirec|tory ".~|
|00001360| 22 20 62 61 73 65 2d 76 | 65 72 73 69 6f 6e 73 20 |" base-v|ersions |
|00001370| 62 76 2d 6c 65 6e 67 74 | 68 20 73 6f 72 74 20 66 |bv-lengt|h sort f|
|00001380| 69 6c 65 2d 6e 61 6d 65 | 2d 61 6c 6c 2d 63 6f 6d |ile-name|-all-com|
|00001390| 70 6c 65 74 69 6f 6e 73 | 20 23 5b 28 66 6e 31 20 |pletions| #[(fn1 |
|000013a0| 66 6e 32 29 20 22 c0 09 | 21 c0 5c 6e 21 56 87 22 |fn2) "..|!.\n!V."|
|000013b0| 20 5b 62 61 63 6b 75 70 | 2d 65 78 74 72 61 63 74 | [backup|-extract|
|000013c0| 2d 76 65 72 73 69 6f 6e | 20 66 6e 31 20 66 6e 32 |-version| fn1 fn2|
|000013d0| 5d 20 33 5d 5d 20 36 20 | 22 5c 0a 52 65 74 75 72 |] 3]] 6 |"\.Retur|
|000013e0| 6e 20 74 68 65 20 6c 61 | 74 65 73 74 20 65 78 69 |n the la|test exi|
|000013f0| 73 74 69 6e 67 20 62 61 | 63 6b 75 70 20 6f 66 20 |sting ba|ckup of |
|00001400| 46 49 4c 45 2c 20 6f 72 | 20 6e 69 6c 2e 22 5d 29 |FILE, or| nil."])|
|00001410| 0a 28 70 72 6f 76 69 64 | 65 20 28 71 75 6f 74 65 |.(provid|e (quote|
|00001420| 20 64 69 66 66 29 29 0a |                         | diff)).|        |
+--------+-------------------------+-------------------------+--------+--------+